bitkeeper revision 1.1041.1.17 (40eb0b673jnCW3n1yVuLT8OFnMJm-Q)

Minor slab tweaks to move ever so slightly toward 2.6 and make ia64
(based on 2.6) easier. (NOTE! kmem_bufctl_t is now a short per 2.6!)

diff --git a/xen/common/slab.c b/xen/common/slab.c
index 2266baa9aff9d673ca2bf9c6fb8591cd4f94ad0e..ab97bc5c33b8c91e8ffe430c914e41cc10f57e2d 100644 (file)
--- a/xen/common/slab.c
+++ b/xen/common/slab.c
@@ -117,9 +117,9 @@
  * is less than 512 (PAGE_SIZE<<3), but greater than 256.
  */
 
-#define BUFCTL_END 0xffffFFFF
-#define        SLAB_LIMIT 0xffffFFFE
-typedef unsigned int kmem_bufctl_t;
+#define BUFCTL_END     (((kmem_bufctl_t)(~0U))-0)
+#define BUFCTL_FREE    (((kmem_bufctl_t)(~0U))-1)
+#define        SLAB_LIMIT      (((kmem_bufctl_t)(~0U))-2)
 
 /* Max number of objs-per-slab for caches which use off-slab slabs.
  * Needed to avoid a possible looping condition in kmem_cache_grow().

diff --git a/xen/include/asm-x86/types.h b/xen/include/asm-x86/types.h
index e2b229edcfa1182ec943aa3daab9dca6bf6979d5..3f1f0a6c6a5cf72702dd9f54fc3869e157bf6950 100644 (file)
--- a/xen/include/asm-x86/types.h
+++ b/xen/include/asm-x86/types.h
@@ -56,4 +56,6 @@ typedef unsigned long size_t;
 typedef unsigned long dma_addr_t;
 typedef u64 dma64_addr_t;
 
+typedef unsigned short kmem_bufctl_t;
+
 #endif